Doc fixes related to "(declare (indent symbol))" (bug#13450)

* doc/lispref/macros.texi (Indenting Macros):
Fix order of an indent symbol's arguments.

* lisp/emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 95cb0d24f6e8c312b2d1bde81f74bda86520f2d2..4a171963e49c353793a6f35bd3f23cf0a1c8e5a2 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-16  Glenn Morris  <rgm@gnu.org>
+
+       * macros.texi (Indenting Macros): Fix order of an indent
+       symbol's arguments.  (Bug#13450)
+
 2013-01-09  Glenn Morris  <rgm@gnu.org>
 
        * commands.texi (Interactive Codes):

diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index 9ad00ca0260238297d4306e3770c3eec3a5d25d1..5520bbbd1dfa7bffd5ea14d64fab339adb4f81e5 100644 (file)
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -606,12 +606,12 @@ calculate the indentation of a line within this expression.  The
 function receives two arguments:
 
 @table @asis
+@item @var{pos}
+The position at which the line being indented begins.
 @item @var{state}
 The value returned by @code{parse-partial-sexp} (a Lisp primitive for
 indentation and nesting computation) when it parses up to the
 beginning of this line.
-@item @var{pos}
-The position at which the line being indented begins.
 @end table
 
 @noindent

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43fd31188e55e99e45d8018e037acf90ea694f04..3851fab5e8869c4c2b5ab3d406e90b3902096ea4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-01-16  Glenn Morris  <rgm@gnu.org>
 
+       * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix.
+
        * mail/rmailmm.el (rmail-insert-mime-forwarded-message):
        Revert 2012-12-29 change.  Ref:
        <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00360.html>

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index a68c727aaba33e8b0bf566e182b172f0d28a675c..fc1cfe7afd12449656ad4e9654b43b52715093c1 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1148,7 +1148,7 @@ is the buffer position of the start of the containing expression."
 The function `calculate-lisp-indent' calls this to determine
 if the arguments of a Lisp function call should be indented specially.
 
-INDENT-POINT is the position where the user typed TAB, or equivalent.
+INDENT-POINT is the position at which the line being indented begins.
 Point is located at the point to indent under (for default indentation);
 STATE is the `parse-partial-sexp' state for that position.